luci-base: revert timeout function argument for addNotification

The function signature changed and all function call to addNotification
that add a CSS class does not work anymore. A direct revert is not
possible.

If this feature is needed than a new function musst be added, that does
not break the function signature.

Fixes: 53e36e3293bee2ea2ce0fbc1250074c44cfe8335
Signed-off-by: Florian Eckert <[email protected]>

diff --git a/modules/luci-base/htdocs/luci-static/resources/ui.js b/modules/luci-base/htdocs/luci-static/resources/ui.js
index e277bbe1b475e87ec4a97a1aab068ff7a6b01e80..10705c1c2842e0f8b7ef6c86f47a4c6a2076f401 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/ui.js
+++ b/modules/luci-base/htdocs/luci-static/resources/ui.js
@@ -3848,11 +3848,6 @@ const UI = baseclass.extend(/** @lends LuCI.ui.prototype */ {
         * to the `dom.content()` function - refer to its documentation for
         * applicable values.
         *       
-        * @param {int} [timeout]
-        * A millisecond value after which the notification will disappear
-        * automatically. If omitted, the notification will remain until it receives
-        * the click event.
-        *
         * @param {...string} [classes]
         * A number of extra CSS class names which are set on the notification
         * banner element.
@@ -3860,7 +3855,7 @@ const UI = baseclass.extend(/** @lends LuCI.ui.prototype */ {
         * @returns {Node}
         * Returns a DOM Node representing the notification banner element.
         */
-       addNotification(title, children, timeout, ...classes) {
+       addNotification(title, children, ...classes) {
                const mc = document.querySelector('#maincontent') ?? document.body;
                const msg = E('div', {
                        'class': 'alert-message fade-in',
@@ -3877,7 +3872,7 @@ const UI = baseclass.extend(/** @lends LuCI.ui.prototype */ {
                                        'class': 'btn',
                                        'style': 'margin-left:auto; margin-top:auto',
                                        'click': function(ev) {
-                                               fadeOutNotification(ev.target);
+                                               dom.parent(ev.target, '.alert-message').classList.add('fade-out');
                                        },
 
                                }, [ _('Dismiss') ])
@@ -3893,27 +3888,6 @@ const UI = baseclass.extend(/** @lends LuCI.ui.prototype */ {
 
                mc.insertBefore(msg, mc.firstElementChild);
 
-               function fadeOutNotification(element) {
-                       const notification = dom.parent(element, '.alert-message');
-                       if (notification) {
-                               notification.classList.add('fade-out');
-                               notification.classList.remove('fade-in');
-                               setTimeout(() => {
-                                       if (notification.parentNode) {
-                                               notification.parentNode.removeChild(notification);
-                                       }
-                               });
-                       }
-               }
-
-               if (typeof timeout === 'number' && timeout > 0) {
-                       setTimeout(() => {
-                               if (msg && msg.parentNode) {
-                                       fadeOutNotification(msg);
-                               }
-                       }, timeout);
-               }
-
                return msg;
        },